From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Fri, 22 Jun 2007 06:02:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18248
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ec9e9bb54921a9233a8fc8e9e02d86cf860f86de;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index a0e6763a203..1752340a3c0 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -561,12 +561,12 @@
 	 (math-format-number 
           (math-add math-fd-date 
                     (eval-when-compile
-                      (math-read-number "1.7214235")))))
+                      (math-read-number-simple "1.7214235")))))
 	((eq x 'j)
 	 (math-format-number (math-add 
                               (math-floor math-fd-date) 
                               (eval-when-compile
-                                (math-read-number "1721424")))))
+                                (math-read-number-simple "1721424")))))
 	((eq x 'U)
 	 (math-format-number (nth 1 (math-date-parts math-fd-date 719164))))
 	((progn
@@ -942,9 +942,9 @@
 					    (if (or (eq this 'j)
 						    (math-integerp num))
                                                 (eval-when-compile
-                                                  (math-read-number "1721424"))
+                                                  (math-read-number-simple "1721424"))
                                               (eval-when-compile
-                                                (math-read-number "1.7214235")))))
+                                                (math-read-number-simple "1.7214235")))))
 			    hour (or (nth 3 num) hour)
 			    minute (or (nth 4 num) minute)
 			    second (or (nth 5 num) second)
@@ -1154,19 +1154,19 @@
   (if (math-realp date)
       (list 'date (if (math-integerp date)
 		      (math-sub date (eval-when-compile
-                                       (math-read-number "1721424")))
+                                       (math-read-number-simple "1721424")))
 		    (setq date (math-sub date 
                                          (eval-when-compile
-                                           (math-read-number "1.7214235"))))
+                                           (math-read-number-simple "1.7214235"))))
 		    (math-sub date (math-div (calcFunc-tzone zone date)
 					     '(float 864 2)))))
     (if (eq (car date) 'date)
 	(math-add (nth 1 date) (if (math-integerp (nth 1 date))
                                    (eval-when-compile
-                                     (math-read-number "1721424"))
+                                     (math-read-number-simple "1721424"))
 				 (math-add  
                                   (eval-when-compile
-                                    (math-read-number "1.7214235"))
+                                    (math-read-number-simple "1.7214235"))
 					   (math-div (calcFunc-tzone zone date)
 						     '(float 864 2)))))
       (math-reject-arg date 'datep))))